(emerge-make-diff3-list): Pass ancestor second.
authorRichard M. Stallman <rms@gnu.org>
Mon, 14 Jun 1993 21:44:34 +0000 (21:44 +0000)
committerRichard M. Stallman <rms@gnu.org>
Mon, 14 Jun 1993 21:44:34 +0000 (21:44 +0000)
commit4a6e3980e26fda95587bff36c3a0efc0779f0202
treea6aa0e89926c2e628eb1efb436bb158872357e37
parent0fc2d0064d82d0d2cab1587a44e9b00e5c934a00
(emerge-make-diff3-list): Pass ancestor second.
(emerge-extract-diffs3): Replace group-1 with group-2.
(emerge-handle-local-variables): Pass no arg to hack-local-variables.
lisp/emerge.el